Created by: gongweibao

Fix part of #10804 (closed) The old PR is https://github.com/PaddlePaddle/Paddle/pull/10805