Fix #369
Merge pull request #370 from sumobi/issue/369

Fix #369