am 86e1b966: Fix ordering bug

* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
  Fix ordering bug