Mem leak fix Wayfarer 2.5