Startup issue fix