Really fix random this time