Rivers pagination fix