Fixes the regression introduced by my previous commit