Fixes lambda evaluation errors