update patch for 407059 to address review comment