FIX false refactoring