Fix initial-buffer-choice logic.