Fix regression on 2.x