Whoops, broke the tests. This should be better.