This should be reported upstream as well