Still stomping sample properties, second attempted fix