fix to move to rivet 2.1.2
Merge pull request #4649 from mkirsano/torivet212

fix to move to rivet 2.1.2