some fix for independent samples