Samples bug fix