Fix for Issue 361