Probably resolved some leaks with this.