Fixed startup-crash