This is supposed to fix issue #471.
Merge pull request #472 from mightyiam/issue_471

Fixes issue #471.