fix Issue #3