#4557 Fix controller mapping.