Attempt to fix Issue #18.