Fixing Panorama Mode