[fix] Memory leak + concurrent transfer bug

Moving listeners for one time handling function removed memory leak