Fix ghost dickery on shield gens (Github #481)