fix #55 #123

Closed ichinose9372 closed 1 week ago