Fix the brokenness, I shouldn't be touching the code today