Fixes wrong mappings