Pulled in the latest bug fix from TA.