Controller bugfix