Controller model fix