ENG-5684: Fix other Random