Fixed problems with the listing of samples