Potential fix for anything relying on self to be single.
Merge pull request #877 from sorlok/with_self_single

Potential fix for anything relying on self to be single.