Fixing tab mappings