Fix for guest