Implemented a temporary fix for the guest issue.