now correctly handles sample cuts (I hope)