Make the compare condition uniform