Update for newer guard