Fix lambdas; fixes #486