This allows successful compilation with (at least) ifort and gfortran

(cherry picked from commit 88a74de992b4d828b98a6e1906dcd61e2863f2f3)