patch accepted upstream