Fixing map...kinda