Add some ordering requirements to hopefully fix #2