correctly handle current shots