Fix for controller