Fix an issue with out of range value being generated