Update fix as per upstream feedback