Fix for Issue 335