fix Issue #137