minor changes related to inv-31