Patch for issue #72