fix the issues due to refactoring

No match.