Wait block clone bugfix