[BUGFIX] Adapt to changes in 3b05b87