Fixed the regression after #865