! fixing loading of map