Fix for refactoring error caught during code review