Implementing fix for Issue #6696