Fixed startup issue