Fix #89

Avoid adding nil fields