Fixed startup problem