[PD] TOT + HAMMER crash resolved