Fix: some bug fix #57

Closed jphan32 closed 1 year ago