BTW,  we have a check down there, around LINE 1411, should move this part of code there.