and guest fix