would be nice, but only if accepted upstream