Fixed issues with inconsistent generations