SONATA-13 - Fix duplicated key/value

Linked to issue #8