Fixing an regression on some machines