fix regression from last refactoring