Patch for Issue #59