Fixes #476
Merge pull request #477 from sumobi/issue/476

Fixes #476