Attempt to fix non-browsable expansion issue