fix to move to rivet 2.1.2