Tweak to make compatible with gfortran