Fixed multiple notice bug
Fixed tap bug