Fix: many bug fix #29

Closed jphan32 closed 1 year ago