iterate correctly over associative array

Change-Id: I8649d5473b06b3e385240de6b87b0ebf5a00b830