fixes #123 and #125, variable substitution on set variable names