Fixed generation crash