Fixed #54 Map bug