bugfix: variable expansion