fix Issue #412

fix Issue #412