Fix after refactoring