Temporary fix for map crash