TST: trying to fix possible mem corruption