Fix on conditionals