PLA-1579 memory leak quickfix