it is not possible to pin-point the BUG/Leak so it may be not possible to fix this way. Also, this patch has side-effect against performance.