fix conflict with jetpack 2.9