Fix viewpoint and zooming bug