HotFix for Map creation.