More leak fix for bug #3155