fix compilation #512
Merge branch 'bugs/512'