Attempt to fix Issue #4