Fixes #201
Fixed mapping