fixed tap issue