Changed dict comprehension to be compatible with python 2.6