fix issues #10