fix: merge latest update #22

Closed dimakrugly closed 1 year ago