fixed #10, fixed #13