Proposed fix for 1450 Mem leak in sample-track