Fix incomplete refactor #2