Bug fix for zoom