Fixed startup delay issue