Fix Mapping to Desambiguate
Merge branch 'FixMapping'