Fix compilation
Merge pull request #635 from cfailde/sept15

Fix compilation