Made this the default behaviour