Fixed for 4.3 controller mapping