*sigh* - it's really not my day today. Attached is patch that actually compiles and fixes the problem. We will need to bump CATVERSION, and maybe should test all the other qualified functions?
Chris