Fixing issue startup issue