Fix potential suite hang