Fixed Rollback Issue