Fixed support for lambda