Technical workaround

Copying a technical workaround made in the Rec version (commit
e0def55f9d851110af3ef0dde482a8569a764dfe)