fix #195
Merge branch 'fix#195' into 1.4.5
Fix #235