Fixing conditional order