fixed #30
fixed #31