minor changes to help finding the allocation bug