This should solve https://github.com/daisy/pipeline-issues/issues/400