do we still need this case ?

if this is null we'll use the number in the caller, anyway