Fixed issue caused by refactor.