Fix key-value comprehension