fixed #17
fixed #17