Fixes problems discussed here: https://lab.nexedi.com/nexedi/wendelin/-/merge_requests/172#note_236344