build on 2.0 too