fix issues #3