Fix maps generating