fixed #33
fixed #32