Bug fixed (or, at least, handed off) - test code commented out