[KLF] Sample spotting again