Fix for Issue 330.