Possible allocation bug fix.