* Patch for issue #167