fix #1542
Merge pull request #1543 from Fleurer/issue1542

fix #1542
Merge branch 'master' into iij