Fixed map crash