fix for Issue #394