Fix to expected_value