Fix 1: Change the order of closure element compare