Patch for issue #11