Bugfix in controller and view