Fixed Gen 2 and Gen 3 crashing

bop