Regression (should have run unit tests!), fixed