Fix for map lag