Fix: revert last refactoring