Fix regression on field values and add test to prevent recurrence. Fixes #4