merged panorama fix