Fixed Build.wait