Fix case number parsing