Partial fix to zooming ticket