1.8: Fixed hangings.