Issue 3919

This is a reworking of https://github.com/otwcode/otwarchive/pull/1531 and Stephaine   should be credited.