Fix potential sample duplicationç