Issue #240

bug fix when loading locations
Merge pull request #241 from FWAJL/dev

Issue #240