fixed #785 #797

Closed user-promi closed 3 months ago