Another attempt to fix non-browsable expansion issue