fix issue #59 #62

Closed nielsencs closed 4 years ago