Fixedd #777 #780

Closed user-promi closed 2 months ago