TAG: patch for Safe Startup