fixing guestAPI handling