Created by: dzhwinter

fix https://github.com/PaddlePaddle/Paddle/issues/9144 and https://github.com/PaddlePaddle/Paddle/issues/8654