rollback and fixed bug

rollback and fixed bug