controller bugfix