Service the calls first

This overcomes the problem with forgetting the running heading.