fixed upstream in 1.5