Fixed an issue in the new generation