[Tak] Fixing Error issues