fixed #31
fixed #32