v2.0 Fix for SARAH v3.1