fix errors in refactor