Fixed issues tapping code problem