fixed #758 #782

Closed user-promi closed 2 months ago