small issue from previous refactoring