Fixed a bug where wrong a return value was returned when mapping is