Created by: jacquesqiao

problem: https://github.com/PaddlePaddle/Paddle/issues/6780 fix: https://github.com/PaddlePaddle/Paddle/issues/6582