Fix to keep main branch operational