Dynamic dictionary type fix