Fixed issue due to changed dictionary.