An attempt to fix GitLab issue #37 failed, but...