bugfix caused by refactoring