Fixing after methods refactoring