fix issues #42 #45 #46