Fixed startup bug