Fixed refactoring issue.