fixed a compiler problem
Merge branch 'hotfix-1.3.5'