fix for previous refactoring