Fix bug no wait
fiw others stuf