regenerate with fixes applied