Fixed startup crash