Created by: wanghaoshuang
fix https://github.com/PaddlePaddle/Paddle/pull/17933#pullrequestreview-247517432
fix https://github.com/PaddlePaddle/Paddle/pull/17933#pullrequestreview-247520444
