Fix to sort of default_shifts (I think)