Fix for Issue #1056