Fixed allocation issue