Fix for Issue #930