Try harder to avoid duplicate order state IDs.