Dict comprehension replaced, should fix #10 and #11