Don't add where conditions twice
Merge pull request #17 from McSimp/fix-where-callbacks

Don't add where conditions twice