BZ-10024: Fix issue on map