John,
You should also be aware of this thread and the comments by @AMP in it. Not sure how far they got with this fix.