Support for new maps
minor fix