Fix on wrong refactoring