fix issue #80 #83