Fix SampleUtils