Attempt to fix map
Contact User (mock) finished