Fixed issues with for comprehensions :\m/: