Try to fix Issue #9