Fix when selection is None