Fixes #110

@zaneveld or @mlangill, can you review this pull request and the corresponding issue (#110)? My guess is that **we don't want to merge this Pull Request**, but rather modify it so there is a conditional that handles some case in the example that I posted in the issue, and some other example. Either that, or I'm doing something dumb and there really isn't an issue. 

Thanks!