Leak fix again