fixed erros with refactor