fix #209
Merge branch 'issue209'