Fixing map issue.