fix lambda_t issue - adrien
fix conflict - adrien