fix Issue #412