fix Issue #76