partial fix for new allocation