rnd class fix