Tuff Client Beta 11 Fix 2021 <COMPLETE