Fix stack overflow on 2.x and 3.x