Update for cd7e2098f3d045bd7197d926a1593a54b3527176