Fixed startup handler