@leo specific viewport issue fix