Fix for Issue 336