I have a more complex fix that I'll put in a later merge request. That does
the job for the time being.