Fix regeneration for real this time