fix issues #13