SONATA-13 - Fix misplaced key/value

Linked to issue #8