Better handling of super shotgun hack