Reorder initial operations to fix first run
Merge pull request #260 from pquentin/reorder-init

Reorder initial operations to fix first run