tf generation fixed