wait-stack fixup