Fixed up after refactor