fixed #392 pull request #391 の残作業