fixed #10 issue