Fix reference due to refactor