Merge "Fix an issue where we should allow negative values but did not"