Minor change to conditional order