Fix a compile error
Merge branch 'fix-issue-6' into release-1.1