Fixed problem map. resolve #15