That is the case with the current code, too. I agree, it should be fixed, but I'd rather do it as separate change. This one already has too much stuff in it.