Strict order fix

Details will be submitted in a jira referencing this pull request.  Ignore the two commits that aren't mine in this, I am not sure what I did to cause them to be part of this pull request, but only my commit is meant to be here.