Fix some bugs only happening for some people. #4

Closed bw8686 closed 2 years ago