tint fixed upstream