add agency count workaround