Proper fix for #569
Merge pull request #571 from spritle/patch-1

Proper fix for #569