fix issues #1