Fixed failed refactoring.
Merge branch 'testing'