another brave attempt of fixing the panorama issues