Fix leakage pathes for V1