Thanks chris at cogdon.org for the report and admackin for the patch. Backport of af953c45 from master