Fix header-selection bugfix