Refactoring fix.