FIX don't use dict comprehension for Py 2.6