Require set where it's needed. Fixes #808
Merge pull request #809 from youdevise/master

Require set where it's needed. Fixes #808