Fixes #401
Merge pull request #402 from sumobi/issue/401

Fixes #401