[v1.20.1] Fixed the bugs that occurred in v1.20.0(Mar. 3rd 2023)