Fix possible integer overflow in last commit.