Shotgun bugfix