multi-lambda fix