Probably fixed map crashing