fix #16 #17

Closed graycat27 closed 2 years ago