This change broke the tests apparently