Fixes #413
Merge pull request #424 from sumobi/issue/413

Fixes #413