#23 fixed a mapping problem