Fix Wait block