Fixing the samples

#1907