fixed all samples