fix Issue #121