I have developed a small patch that fixes this issue. If you're interested I'll send a copyright assignment form.