#4 Fixed bug with ambigious mapping