Fix skipping of samples