fix expectation evaluation