update patch to wait for fields