Fixed issue with mapping values