Fixed build
Merge pull request #2983 from dinhviethoa/fix-build-2

Fixed build