fix Issue #4