Fix usg hang