Fixed map interaction issue