Fix another broken point concerned with private mode 8840/8428