issue-6200 - Fix error from refactoring.