Samples bugfix