[Screen Geometry] fix for the new code base