[fix-hang] Specify most recent non-blocking version of guard