Fixed MapController :D