fix #78 #79

Closed danilin-em closed 4 years ago