Controller bugfix3