Fix duplicate key mapping