Fix regression from refactoring