Cleaned up user map issue.