lambdas fixes