Bugfix for long random strings and more randomness