Small refactoring fix.