Regenerate properly