fixing mappings