Reduced number of samples, see #263