fix issue for guest