fixed #20
fixed #21