bugfix when refactoring
controller changes