fix comprehensions