Fix for Issue #385.