Fixing missed refactoring