FIX wrong refactoring