BTW, I'm not suggesting you need to support that just yet. Perhaps use the old behavior in that case. I'm not sure.