Broken TTFs fixed

Broken TTFs fixed