Issue 1325: Always vars included