fix for "dictionary changed size" in commit 07ae422faec18f16b5d68eeab916fedde47ad08a