Xfail contact and fix tap issue