Hot fix for last generation and last iteration