Fix for Issue 340