Fix for Issue #1799