Got rid of the last fix because Don just fixed it in his.