fixed non touch / touch collisions