Fixes #147
Merge pull request #169 from DoSomething/fix-147

Fixes #147