Compile fix.
Merge pull request #3502 from Zuhayr/master

Compile fix.