Fix uncomplete refactoring