Compile fix.
Merge pull request #3472 from Zuhayr/dev

Compile fix.