Patch for issue #67