Fix for Issue #1639