My friend Grant, who does not have an account here, thinks this patch will help you guys:
...