REALLY FIXING #3.  Sheeesh.