Fixed up wrongly changed configuration keys
oops, fixed an CME caused by removing an entry of a list while iterating over the list with for-each