Fixed onStartup