JHT ===> Added a patch from Tim Small (UK)