fix Issue #146