Issue #240

bug fix when loading locations