improve lambda handling