Fix #121: Avoid phase ordering issues on initial provision