Fix problem with map