RandomValueGenerator fix