fixed issues #10