Fix number issue part 2