ViewPort bug fix
ViewPort bug fix