Fixed the user map