fix Issue #6