fixed bug #35,#36