Fixed map crashing