remove one lambda, not sure if this helps