diff --git a/m4/giella-macros.m4 b/m4/giella-macros.m4
index f740727..7b41780 100644
--- a/m4/giella-macros.m4
+++ b/m4/giella-macros.m4
@@ -88,7 +88,7 @@ AC_MSG_RESULT([$GIELLA_CORE])
 ###############################################################
 ### This is the version of the Giella Core that we require. ###
 ### UPDATE AS NEEDED.
-_giella_core_min_version=0.22.0
+_giella_core_min_version=0.22.2
 
 # GIELLA_CORE/GTCORE env. variable, required by the infrastructure to find scripts:
 AC_ARG_VAR([GIELLA_CORE], [directory for the Giella infra core scripts and other required resources])
diff --git a/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in b/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in
index 9fbb2c3..eceb38a 100755
--- a/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in
+++ b/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in
@@ -28,13 +28,9 @@ checked_lemmas=checked_lemmas.txt
 ##### Extract lemmas - add additional egrep pattern as parameters: #####
 ##### --include "(pattern1|pattern2|...)"                          #####
 ##### --exclude "(pattern1|pattern2|...)"                          #####
-rm -f $lemmas
-touch $lemmas
-for f in $source_files; do
-    @GTCORE@/scripts/extract-lemmas.sh \
+@GTCORE@/scripts/extract-lemmas.sh \
     --exclude "(CmpN/Only|ShCmp|\+Cmp\/SplitR| Rreal | R | Rnoun |\+V\+|NOT-TO-LEMMATEST)" \
-    $f >> $lemmas
-done
+    $source_files > $lemmas
 
 ####### Start testing: #######