rollback some mistakes