Add fix for leak