WIP: fix regression pointed out by @lgalfaso