fixes eval logic