Refactor broke it, unbreaking