Correct a compilation error
Merge branch 'compilation'