Added fix for image in map view