Fixed problem with Inhaber and added flag for agent