Added in a fix for bug #7567.