Hopefully this fixes the regression