Avoid bug when guest checkout