Fixed refactor breakage