Better fix for slow Map loading