Should that be fixed as part of this work?  I'm just reproducing the current behavior - if we want new behavior that sounds like a separate bug to me.