[BUGFIX] Follow-up for ae833eb93