Fixed map not initializing correctly!!!!!!!!!!!!!!!