Waitforschemaagreement fix