the original change broke a few tests.  I think this one is better