Rebuild for retry support