Try to fix Issue #1