Adapt to GlueGen commit 1a01dce6c42b398cdd68d405828774a3ab366456