Fix #308
Merge pull request #351 from ysuganuma/Fix308

Fix #308