Fix double-free

Closed Ghost User requested to merge (removed):master into master

Please merge. Thanks.

Merge request reports