Fix stop randomize to work consitently