Fix on evaluation