Fix bug with multiple-fields