HOTFIX: Fix startup order