- Fixed double-free bug found by Brett