fix missing refactoring from previous commit