Fixed generations

Better generation handling.