Fix for Issue #368