Retry due to watermark issues