Fixed controller to use override mechanism