[Tak] Fixing Bug