Take values into account too