Fixes an issue with shifts on subsets