Correction after refactoring