Fixed the problem with straights, but two versions of random aren't so