Fix for Issue 3339