* Integrate patch for ticket #16