Fixed, broke and fixed again. Whew!