fix Issue #394