Fixed a bug, introduced a different bug.  It's improving, though.