bugfix in controller