fix roll-back