bugfix in Controller + added test