Fix for previous, needs a sort.