fix for variable expansion