Fixed refactoring bug.