fixed #30
fixed #32