no_guests bug fix