Honestly, it's not something that needs fixed. Fixing the lame definition of a loaded gun being a loaded mag, fix that, but there is nothing wrong with a requal after 10 years. Given the general demographic I've seen come through classes in the past 6 years, I would go so far as to require a requal at all renewals, not just the second.