Fix: refactored