OPAL-1910: Fixing issue that the reordered term was sometimes lost