Temporary fix for map sync bug