prevent infinte loop on 2.0 branch