fixed groupby/resample