Fix: comparison mechanism