Patch for issue #2