Gourmand check

Should fix #6985, but then I thought I nailed it already.