Use new default behaviour