Patch for Issue #170