Fixing map crash, issue #66