Fix for Issue #2199