Fix for Issue #1998

Fix for Issue #1998