fixed #31
fixed #30