NExt23 allocation fix