Fix support of old generations

Now according to the recommendation of kotarou in #444