this unstatic patch has beed applied upstream