Fix for Issue #392