[DEBUG] Fix refactoring forgotten tricks