Fix missing token in RPC
some glich in commits