fix issues #2 #1