add better actor checking