[Tak] Try to fix bug....