re-generate with fixes