Another fix for map orientation change