Yes. Please change to:
```scala
new Fields(fieldMap.map { case (fieldName, _) => fieldName })
```
Isn't that right?