Fix ordering for first-time modeling.