Attempt to fix Issue #11