Initial fix of zoomToFit