fixed bug #81 #82