Were Tomac and Barcia lined up in the wrong spot for the restart?

Or am I just reading this wrong?

The rulebook says: The starting order will be determined by each rider’s race position at the end of the lap preceding the last lap completed by the leader. I.E. if the leader has completed the third lap and is working the fourth lap, the starting order would be set with the order from the completion of the second lap.

Roczen had completed his 6th lap and was "working the seventh lap" when the red flag came out. Going by what the rulebook states, it appears that the riders should have been lined up based on how they crossed the line at the end of lap 5, which would have put both Tomac and Barcia ahead of Friese for the staggered restart. Instead, it seems as though they were lined up based on the end of lap 4 results.

Would it have made a difference? Who's to say, but with Tomac finishing just 2.5 seconds behind Roczen, I'm sure he'd have preferred to not have to deal with passing Friese a second time.