Fix for Issue #338