Bugfix in Modelcontroller