Fix exit on tap