Problem with mapping keeps popping up...

...So I fixed it again.