Fix on computation