Really fix #12
Merge pull request #63 from ticosax/fix-multi-value-fields

Really fix #12