Fixes issue ue with guest orders