[FIX] fields.py - avoid dict comprehension inside a dict comprehension