Added a flag to expose the include_vars bug