Invert key and value for some elements - issue #58