[TW137] - Another attempt to solve the hot threat issue