fixed bug #109,#117