Hi, I noticed that #350 adds an exception for rv64 which solves the same issue with #370. I should apologize here because I didn't notice that PR when I created my PR. I think one PR should be reverted, two snippets of code which try to solve the same problem is bad.