Fixup memory leak
Merge branch 'fix_cups_16_issue'