fixed #21
fixed #20