Bug fix for new mapping table.