Fixing issues with mapping