fix compile #515
Merge branch 'bugs/515'