Yes, the way you propose is far better. I add a patch for that.