fix compiling error
Merge pull request #7059 from Rumist/v3

BUG FIX : #5553
Merge pull request #7108 from minggo/v3

fix compiling error