eval logic fix