Fix an integer overflow down with previous commit