one more fix to expand_vars