Fixed the map index bug!