attempts to fix mappings issues