Fix for Issue 334