Fixed stuff with function comprehension