Fix for Issue #1349