rollback some bugs