Avoid mixing mapped and table keys