fixed #20 #3