Fixing _ leak