Proposed fix for issue #7757