fix Issue #328