Deal properly with self.fields = []
Merge pull request #260 from merrellb/master

Deal properly with self.fields = []