Try to fix Issue #2