fix tap issue