Has a fix for this been sent upstream as well?