Patch for ticket #34 easyfix