Bugfix in controller