fixed bug #152,#155