Fix the number logic