Fix what I broke during refactor