Change dict comprehension so it works in 2.6