Fixing this stupid map