fix Issue #10