Add commented out fix for controller