Hoping to fix Startup timeout problem