I've checked the patch above which works like a charm.  I've created a new patch.  Please credit the original author before merging.