Fixes 468
Merge pull request #475 from sumobi/issue/468

Fixes 468