fix Issue #21