[FIX] Simpler fix for default startup