Compile fix.
Merge pull request #3573 from Segrain/master

Compile fix.