Shouldn't this be ``elif field in self.fields`` instead?