fixed rollback otl checkout bugs