fix #424
Merge pull request #143 from hamaco/fix/bug-424

fix #424