Added missing wrappings into lambdas