Fixed fancy data randomizing (again)