Patching my original patch for Issue #85