fix https://github.com/PaddlePaddle/Paddle/issues/9014 and https://github.com/PaddlePaddle/Paddle/pull/10304
