Integrate fix from glyffin.