Fix better distribution model