Fixing shoot logic