Patch for issue #66