Gourmand check

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