fixed #13
fixed #17