Created by: QiJune

Fix #6142 (closed)

And for more details, please refer to #6141 (closed) and #6035 (closed)