Bugfix Controller