correct dangling pointer race (Bakul Shah)
4 files changed