fixed #19
fixed #20