Finished fixing map (Fixes #61)