V1 memory leak fix