The dust settled much sooner than I had imagined. I tested your patch and it works fine there. I replied to the g/h issue as well.