Fix for Issue 444