Allocation fix