Bugfix + performance improvement.
Better random datas