minor bugfix due to refactoring