- may have a fix for re-entrant client