Fixed bug in safehouse related to map refactor