Attempt to fix Issue #1