need to fix tf crash