Created by: qingqing01

Fix https://github.com/PaddlePaddle/Paddle/issues/6699

For a better review, you could see it here.