[PATCH 10/10] Fix "Undefined variable 'comapator'"