Samples fix