Patch for Issue #120